-
Notifications
You must be signed in to change notification settings - Fork 2.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Convert README & CONTRIBUTING from rst to md #1633
Conversation
@davidylee Amazing contribution thank you so much! There's a conflict that I can't resolve - which involved merging in CONTRIBUTING.rst and updating your branch. Can you take a look? Curious - did you run pandoc against this or do something else? |
Hi @chayim -- I believe I have pushed resolving changes. And yes, utilized pandoc! Would you be able to add a hacktoberfest-accepted label ? I'm trying to get qualifying PRs. |
@davidylee Hmmm.. still conflicting on your side. Mind having another go. Label applied thanks! Heck, if you're really game we'd love contributions, docs.... well help in general! |
9986cb3
to
009d63b
Compare
I think it should be good now. If not, I'm not quite sure how to see what's going on, could you guide me how? |
Hi @davidylee I took a look locally. So, the issue is that there are changes to the CONTRIBUTING.rst file since this change. My advice is to branch (again) off of the current master, and then do the conversions and submit. I'm sorry about the pain - it's a branch timing+changes issue. Sorry about this! |
009d63b
to
58c7273
Compare
Sure @chayim , done.. hope it worked.. |
Ah - I think I see it. Your local fork of master is out of date. Update your master, merge your master into your branch, then update this PR and I think we're okay. I don't really know what's happening on your end. Thanks for working through this! |
58c7273
to
e66594c
Compare
@chayim Thanks so much for your patience with me, I finally fixed it..! |
All good @davidylee thank you so much for working this through. Glad to have this in the release we're about to make! |
Pull Request check-list
Please make sure to review and check all of these items:
$ tox
pass with this change (including linting)?NOTE: these things are not required to open a PR and can be done
afterwards / while the PR is open.
Description of change
Resolves #1631
Convert README & CONTRIBUTING from rst to md